Coffee fix
Add masks