Add back all changes from previous PR
Removed files I missed