Preliminary changes to advanced fabbers.