Better this_obj handling, step 1