Updated some methods