changed mixin to reflect new analytics scheme