Just adding more handling for the commander module