Oops.. Add missing file and fix overwritten changes