Updating with latest image enhancer code