imrpoved goto event