Changes on Design & Add new Statistics Features