Added uniform and updated random sampling