Some little changes 2