Restored original makefile!