improved shell a tiny bit again