deleted commented part and fixed header bug