Added things and modified tempalte