Little more modifications