Forum lib to be fixed rebased