added pinner patch for mapping