Removed shiftX/Y functionality