Upgraded Makefile