todd's changes