Minor Function call changes..