refactored switch between release and normal push