Here's a modification I would like to see.