More improvement for direct FS action