more changes to initialization code.