for issue #11 analytics