images refactored