Modified 'download' method