More work on Coffee Maker