final changes

commiting final changes