changes for Andrew to whatcom msa