Added missing files from previous 3 commits