added transitions and others