new generator, modified Makefile