Updating name
Adding mask checking.