some changes with header