get rid of make_application