Added back changes in merge conflict

I thought I had overidden my changes with Dimitar's
Its all fixed now...I think