Added some friend entitys and rr