trying to fix things so I can merge with master...