Missed some files and changes