Improved #4.