[Client][Controller] Some changes, for debug.