a few changes with 'loops