added multipe constraints
added calculated value