major change - html restructured