re-stucture LBQ