Yes, that would be great. This is a real problem for me. Especially because I don't drink coffee, either.