- Added optimization that simplifies extended moves