New Makefile v6