Fixed header issue and made timezone addition work