Stripped out even more, changed dom api