Version2-new makefile