Criteria is attached, and mapping bugs fixed