T branch fix now dynamic