Added Fiber logic