more criteria, and docs