Some little changes
More little changes