about to intigrate with yathi's code