working on entity