recapped the walls
clearing up and rearranged entityManager