merge booth changes Jervin

merge booth changes Jervin