replaced echo with return