done refactoring and updated taza version