Add remaining pieces for qshift