Remove initial mask file requirement
Increment mask index by one