remove <return> behaviour, add command to switch shell