Revised images + optimized