calculations improvement