Made changes requested by Amber