Also change Makefile