Bugfix from last commit - changed the headers to match new function definitions