Main State and EStop revised + Starter instead of StatedTest + Comments