Modified class calls to match recommendation