Coffee logic
more coffee overrides
Merge