Changed coding style, now using on().