Version 3.3: follow the change of the HTML structure