rearranging to prevent dupe download: #MSG-255 In Progress