Changed the profile calls to a more standard approach
Slightly more canonical in dealing with return values.