Updated forcecalculator