updated to use group 'toro' for better modularity