main_wrapper changes