stashed makefile changes