Added Yonatan's changes + .html