Cup-of-joe-theme with more changes.