started moving some properties to headers