restructered/simplified some points