UPDATE Version 1, removed uniqe key