Added version checks and easymotion