Move to a tay-based extension