Modify shapedemo to work with new Image function.