Makefile changes - not working yet