changed variable names in unload