- reordered packages to simplify conditions