before asking for the right setup of header, ...
some change done
some code cleaned