change appropriate_entity from protected to private