Updated

Sorted out number generation