More work on image mode