Reverted arrays and added a ugly hack for timezone