Updating Makefile for BW, still needs testing