got rid of more echos in the script