Ian's changes

Bringing Ian’s changes over here