unfinished changes in headers etc