removed annoying template comment
changed state machine to totally work with repo