Improved Function Calling and implementation.