updated to correspond with comments