Changed script and Makefile