updates for 8A and 8B