made some changes in criteria