Code improved!