fixed random bugs
first testing
Masking works!