Added anayltics (again