header changes, master controller changes