Removed shuffle dependency