Daniel's edit merge

possibly merged not sure.