added friendly. to relevant files