Potential mobile fix, added analytics