Adding Makefile Mode (with modifications)