after changing to generic views