Modifications to original makefile