Added more movement smartness