incremental. adding support for click logging