final changes to Drowning of Echo code