UPdated makefile