added data directories - finished optional headers