Thanks to Samuel (_SjG_) for making these changes as I have been pre-occupied by other projects.