Maybe move this to a different method ?