Adding feature 2 bug fixes bug code 485738