Added random and fixed issues (commented out random)