New constants.  Changed horizontal ordering of search criteria.