Updated routing and added random number gen"