refactoring, updating POD