[@Lugubrious] Did a bit of tweaking on the original CS. Feel free to review.