[Fractdev] Patch 5 and 6