Switching from 2 package lists to 1 unified one