redone events, fixed relationship error