further shrink code