weren't you going to move this logic?