new version of makefile