Improve update process
Improve event control
Improve redirect process