Changed file structure of this_user block