did more clever duration working/calculations.