improve role & mask