api check changes and bug fix for Fast