1. Now returns the added constraints
2. Removed dumb checks which weren't useful anyway