Update and modified Makefile