Improved #2.