change initialaizaiton logic