got rid of unnecessary echos