Reworking initialization