Why did we need to move this around?