I decided to avoid modifying this bit of code for fear of breaking it (a sign it would probably benefit from refactoring :smile:). I like your suggestion.