Improved part from me