made changes on sharon's machine and updated primary key code