Modified Makefile accordingly