More clean, add mask window