update logic
add image
merge conflitcs