final fix with primary keys