Update to entity fun