some decore changes in

* development 1
* strategy 2