Updates, refactoring