Yellow Contraints fixed