Dev branch

Prefer to contain this logic insider the `initialize` method