Then ... I will redo all addition to be compatible with requests. 

There are few other places that I should touch it.