Updates after Ian's feedback