Changes made by Ian and freelancer