Added calculations