Jinpa master surv button

tested the error case this time as well.