two new cases; add database code