Pull update and restart seems to work. Added some comments
Removed bad merge
Removed bad merge