modified to work with Cheff 11