Merge 2 versions of P00_Firefly