Making some tweaks on commit 581b712dd944cd7b90bc99481d86a3b4fd695dea for better Initialization.