Modified Event controller