More work on terminals.