updated calculations