FPS update

Not working properly yet.. but gotta check differences with the master
without losing progression!