Some rejiggering. Hope you like.