Edits so that it only needs the physics rewrites