Revert to include DATA loop