Updating some functions..