diff --git a/src/de/dhbwstuttgart/strucTypes/Type.java b/src/de/dhbwstuttgart/strucTypes/Type.java
index c4c12dd8..6db69620 100644
--- a/src/de/dhbwstuttgart/strucTypes/Type.java
+++ b/src/de/dhbwstuttgart/strucTypes/Type.java
@@ -16,15 +16,15 @@ public class Type {
 	private List<TC_Abstract> result_constraint_set; 
 		
 	
-	public Type(List<AS_Abstract>  ass, SourceFile sf) {
+	public Type(List<AS_Abstract>  ass, ClassOrInterface cl) {
 		
 		this.result_constraint_set = new ArrayList<TC_Abstract>(); 
 		
 		// =:fass
-		List<AS_Field> fass = make_field_assumptions(sf);
+		List<AS_Field> fass = make_field_assumptions(cl);
 		
 		// =: mass
-		List<AS_Method> mass = make_method_assumptions(sf); 	
+		List<AS_Method> mass = make_method_assumptions(cl); 	
 				
 		// -> AssAll =  ass + fass + mass 
 		List<AS_Abstract> assAll = new ArrayList<AS_Abstract>(); 
@@ -56,30 +56,29 @@ public class Type {
 	
 	
 	// fass 
-	private List<AS_Field> make_field_assumptions(SourceFile sf) {	
+	private List<AS_Field> make_field_assumptions(ClassOrInterface cl) {	
 		
 		List<AS_Field> fass = new ArrayList<AS_Field>();  
 			
-		for (ClassOrInterface cl : sf.KlassenVektor ) {			
+					
 			for (Field f : cl.getFieldDecl() ) {				
 				AS_Field as_f = new AS_Field(cl, f) ;	
 				fass.add(as_f);  				
 			}			
-		}		
+				
 		return fass; 
 	}
 	
 	// mass 
-	private List<AS_Method> make_method_assumptions(SourceFile sf) {
+	private List<AS_Method> make_method_assumptions(ClassOrInterface cl) {
 		
 		List<AS_Method> mass = new ArrayList<AS_Method>(); 
-		
-		for(ClassOrInterface cl : sf.KlassenVektor) {
+			
 			for(Method m : cl.getMethods() ) {
 				AS_Method as_m = new AS_Method(cl,m); 
 				mass.add(as_m); 				
 			}			
-		}
+		
 		return mass; 
 	}
 	
diff --git a/test/strucTypes/GeneralParserTest.java b/test/strucTypes/GeneralParserTest.java
index b8603254..8f5ea68b 100644
--- a/test/strucTypes/GeneralParserTest.java
+++ b/test/strucTypes/GeneralParserTest.java
@@ -53,7 +53,9 @@ public class GeneralParserTest{
 				SourceFile sfdebug = sf; 	
 								
 				List<AS_Abstract> ass = new ArrayList<AS_Abstract>(); 
-				Type type = new Type( ass , sf);
+				Type type = new Type( ass , sf.KlassenVektor.get(0));
+				
+