update for terra branch