Refactored Terminal Calls