Improved solution for 02