Hey, how about this

Have a look at my changes... You may choose to pull them all or just some of them.