Trying to improve shell connection a bit more.