fixed header def and commented