removed bond price & update risk analysis calculation