Added more automaton stuff