Updated funtions...