My code optimization upgrade

new ver