Refactored Commander Block