Changed the Makefiles and the script