added timezone info and updated todo