more final changes to expansion