Dustin's changes in advanced deserve a new version :grin: