#2 - Added Analytics