Some of improvements