Modify to work with UDivider