production ready, added analdded anallytics2