Changes requested by Ian regarding primary keys in table