Modified Makefile and remake