updates to correct 'should' convention