Brought over changes from corrupted repo