necessary changes after introduction of 'None' key