refactor glue & gift cb