uncommented and init corrected