Modified Events controller & model