moved handler to analytic activity