Fiddled with initialization code.