Bounties #15 and #17