overhaul, added pixi