Added some event controls