Added more conditionals to move analysis