Removing ZigFu and some modifications