More modifications to work on image