Update to be suitable for changed HTML