some calculation updates