edits and intra site porting