q22,23 added