Lots of tweaks as per Devon