Ian's changes