added analytics tracking
big message improvement