change move-constraints arguments for a more logic ones