Merging Ian's changes