-- adjusting shell commands to use new architecture