modified all 3 files r:self