Added event shifter, updated event detector to put in db or in List