Revised Makefile