added comments and echos