work on bounty 227

Bounty https://assembly.com/buckets/bounties/227