some more refactoring
add user study 2