updated criteria , bug fixes
updated criteria , bug fixes