Modified to invoke make less times.