refactored transitions, new school modal, regex check