reorganizing for second pass