changed shift to enter and likewise