Complex events fixed take 2