rework creating of event and cal