Feature/calendar modify