Get these functions to match up properly