Removed commented out code and added more flurry tracking