More modifications to sort out header issue