2d+0d config added and tested; 1d+0d+2q added and tested