category and email template changed a bit