corrections, added fabric saving