Corrected further issues with each function call.