rearrange some stuff for the user test