Additional effect transitions
Event simulation code improved