Modified mask factory to correctly handle external input from the theme park