Rewrote makefile