added some wrinkles to 6 and 7