Made some corrections in the context of removed constraints