Made changes to add timezone functionality