Rewritten Makefile