Adjusted for altered channel types mostly