Better testing and removed fps object.