Integrating with the new code by Yathi