diff --git a/Socialmetrica.package/NitterUser.class/instance/collectRawTweetsUpToPage..st b/Socialmetrica.package/NitterUser.class/instance/collectRawTweetsUpToPage..st
index 9ab5715..88149e6 100644
--- a/Socialmetrica.package/NitterUser.class/instance/collectRawTweetsUpToPage..st
+++ b/Socialmetrica.package/NitterUser.class/instance/collectRawTweetsUpToPage..st
@@ -3,9 +3,7 @@ collectRawTweetsUpToPage: anInteger
 
 	| pagesDict response customQuery |
 	pagesDict := self getPagesContentsUpto: anInteger.
-	response := TweetsCollection new
-		messages: OrderedCollection new;
-		yourself.
+	response := TweetsCollection new.
 	customQuery := Dictionary new
 		               at: 'parameters' put: pagesDict keys;
 		               at: 'date' put: DateAndTime now;
@@ -19,16 +17,16 @@ collectRawTweetsUpToPage: anInteger
 		 	tempTweet metadata 
 		 		at: DateAndTime now asString put: key;
 		 		yourself.
-		 	response messages add: tempTweet.
+		 	response add: tempTweet.
 		 ]
 	].
-	response messages doWithIndex: [ :tweet :i | 
+	"response messages doWithIndex: [ :tweet :i | 
 		| current previous |
 		current := response messages at: i.
 		i < response messages size ifTrue: [ 
 			previous := response messages at: i + 1.
 			current timelines
 				at: self userName put: previous id;
-				yourself ]].
+				yourself ]]."
 	^ response.
 	
\ No newline at end of file
diff --git a/Socialmetrica.package/NitterUser.class/instance/getPagesContentsUpto..st b/Socialmetrica.package/NitterUser.class/instance/getPagesContentsUpto..st
index 8ddf83a..1d9e806 100644
--- a/Socialmetrica.package/NitterUser.class/instance/getPagesContentsUpto..st
+++ b/Socialmetrica.package/NitterUser.class/instance/getPagesContentsUpto..st
@@ -13,7 +13,7 @@ getPagesContentsUpto: anInteger
 	anInteger - 1 timesRepeat: [ | pageCursor |
 		pageCursor := self pageCursorFor:previousPageLink.
 		nextPageLink := self userNameLink, '/with_replies', pageCursor keys first.
-		response at: nextPageLink put: pageCursor values first.			
+		response at: nextPageLink put: (XMLHTMLParser parse:nextPageLink asUrl retrieveContents).			
 		previousPageLink := nextPageLink 
 	].
 	^ response
\ No newline at end of file
diff --git a/Socialmetrica.package/TweetsCollection.class/instance/add..st b/Socialmetrica.package/TweetsCollection.class/instance/add..st
deleted file mode 100644
index c55646f..0000000
--- a/Socialmetrica.package/TweetsCollection.class/instance/add..st
+++ /dev/null
@@ -1,3 +0,0 @@
-accessing
-add: aTweet
-	self messages add: aTweet
\ No newline at end of file
diff --git a/Socialmetrica.package/TweetsCollection.class/instance/messages.st b/Socialmetrica.package/TweetsCollection.class/instance/messages.st
index b3a1cb3..1e354aa 100644
--- a/Socialmetrica.package/TweetsCollection.class/instance/messages.st
+++ b/Socialmetrica.package/TweetsCollection.class/instance/messages.st
@@ -1,3 +1,3 @@
 accessing
 messages
-	^ array ifNil: [ array := OrderedCollection new ]
\ No newline at end of file
+	^ array "ifNil: [ array := OrderedCollection new ]"
\ No newline at end of file