calculations updated