Improved the final part.