rework positions to use a simple mask rather than separate models