fix: changing location of others to their meaningful respective places

fix: changing location of others to their meaningful respective places #2373