add to umbrella header, clean up