major revamp for commander