Little modifications, restart still have to be tested