Version 2 of my submission. What do you think?