New images. And Someupdates to the implementation