Removed echos and stuff