Updated terminal interface, not completed yet