change to current html - with tests