Readded files that should be in master