Here's the same thing combined with your initial patch: