Improved again some code