Added fucntionality in my custom call
buggy