adding analytics
adding timeouts