Back to working shellswap