Changes according to Edson's thoughts