Added fibers, needs testing