refactored images