Adding some checks, required timezone setting for time calculations