make make less hacky