Makefile updated and works