changed to class-based generic views for d1.5