making finishing touches to agree with design
merging new changes