Updating to account for Poodle!