Damian Conway improvements :)