merged in joes build changes