Manage Special Events code cleanup, Insert working