Pixel: WIP upgrades