Changed from static numbers to auto generates numbers
Merge remote-tracking branch 'origin/master'