added Jame's proposed changes