Updated to fix issue with timezone