Adding solution to SUBS and fixing up FIB