Merging Dazzozo changes...