CHANGE: changed some states based on discussion