New Makefile (easier to build)