made calling interaction handlers a little more robust
resolve merge conflicts