FIXUP FOR BUILD - squash down