rewrote Makefile