added teacher, added new migrate, updated regex