redid #6 - I  think it's much better now