add timezone script and reogranise