Added FPS handling