Complete event control functions added