Upgraded makefile