Updated Makefile (again)