Improved #9
Improved #10