Little more Modifications done