moved Carroll out of class, renamed