Fixed Analytics...for baseline