more expansion - some inconsistencies in file (will be fixed)