updated to use cheshire.core