Here's a second version, lingering issues were resolved