fixed constraints, added value selection