Changes to Fibq interface