add more constraints and rebuild solver system everytime it needs to be executed
remove unneeded files
add missing files