working on entitys