changes in header and bug fixed