Updated some methods
Updated some methods