Changes based on @chrisn comments