Starting to add shape criteria.