need to merge with latest master to continue event db