Added header comment and changed config