modified fps
merged conflicts