Pico 0.7 -- upgrades merge