Added missing constraint
Improved output