Final changes for #552; needs event fix