make entities passable and mutex location updates