Some more changes, taking COFFEE!