PheonixBolt changes