renamed tank to entity