STILL cleaning up the functions we leveraged