Changed switchToFrame (and others)