made some changes ...