Some changes

Felt that this needed some adjustment, still not sure about it !