Hope this helps

Some changes that I hope help to make things smoother.