Refactoring + new content