Remove unmask and upper
Modify main