Build 34: improved file loading