Updated function names to better reflect... what it is.