Changing to remove scoobi :(