Fix FPS issue
Need to work out what went wrong and clean up the copy/paste stuff