updated to squash output, use Makefile