merge code with Bo