more changes to work with taza