REK: added mask and override to base filename