begin to add evaluation support