Changes

* reorganizing methods