made some changes..