Changed the whole content exactly same as hwk