updates/refactorings