updated fps
merge