I have a trouble with the architecture , so I try to fix it slightly.