Working version without random pick