DiplayName bug fixed
Code improved