Added optimization changes
image modifications