made some changes
made some final changes