Added images and unwind workaround