updated with calendar and email