fixed that coffee is now always in front
Merge branch 'aries'