Moved constraints to a more reasonable system