Readding complex shift_scope; need to fix as