Shift works now better