core changes with email controller