Thanks for your suggestions and time, I will update the underlying functions.