Removed unworking constraints