Handle more events + more comments in code