Improved shell, to be tested. Without logs.