Return from exported functions
Don't export now that it's returned
Use new return value