Made some FPS patches
Merge remote-tracking branch 'origin/SagieBranch'