working on fixing the headers issue