Try to sort out the events file a bit more