Refactoring and new images