action/event improvement - still has bug where two changes are registered instead of one