Updated value splitting logic