Update to include Shift