Made changes to 976089 based on zeus' feedback