Make command less hacky