Removed bug of not sorting
Groep A&B constraints take time into account

To make it more feasible.