Added timezone check