What was the impetus for changing this class?