Added more to the basic functions.