Updating to PHPixie 2