Update with FPS support and other