Updated version of the makefile