Add in the shift-Y mapping. remove commented out lines