Comments updated on image handler - complete