merging in modified view from Joel Swan
removing unused reg path. update entity class