Removed constraints. Moved evaluation criteria to