Some little changes....