Simplified motion logic and am pretty satisfied