Complete PR for FSW