GNL V2.0 / fixing files bugs