Added more optimization to images