changed some things in preparation for transparancy; changed header names