Remove references to Holders
Use new getFriendly method