cym: added 6 more cases