Moving some logic around
Moving some logic around

Signed-off-by: Vishal Rana <54e88dfdee11a18f791b7188a9ffbcd1fdba30bd@labstack.com>

gavv/echo,coderhaoxin/echo,mtojek/echo,CaptainCodeman/echo,webx-top/echo,CaptainCodeman/echo,webx-top/echo,qtzheng/echo,olliephillips/echo,o1egl/echo,buztard/echo,coderhaoxin/echo,caiqfrog/echo,o1egl/echo,mtojek/echo,olliephillips/echo,currantlabs/echo,dre1080/echo,labstack/echo,gavv/echo,webus/echo,coderhaoxin/echo,labstack/echo