Updated some methods
-