Adjust to the new DOM