checked everything and sync to all files of master ror