added unloadNxPart method + refactor