Improve poly representation