With Edit Event

Still that bug. Partially working