Smoother upload, removed mask inputs