Extended with extra Dubby goodness…

Original Version