Changed the initialization process