trying to fix primary key issues