some tidying in 2. started looking at 3