Continued analytics edits