Refactor and launch on less than full offer