Mostly changes to coffee