refactoring + add image