First full pass over new motivation.