Improved #1 and #2