update for DOM-Delegate and HAPI