Better performance, added events