modified to work with new download package