Improved #3