+incorporated changes from Ali, Courtney and Whitney