more initialization changes