Here's the rework of your file.