Updating some methods and things