better handling of tzs