Image stuff again

For Adarsh - added in slave and master...