A little bit changes and improvements