Further modified makefile