improve mass
add user decorator