changed where 'current-state' comes from (temporarily)