changed function names since I moved to new module