Fixed identation, added echos