Added data calculating