Aligning functions to use new function