FAST source code update