More checking IsDownloaded, needs refactoring

Change-Id: I7ff4654bc7fee65f4539618741f8c41f44daaf91