Improve myself ...