updates for new makefile