Updated with usage of Random number helper