some points added, others removed, removed unused rules