update to raw calculations