Switched to Makefile