Dynamics Update

Update after Comparing to JoiNNN’s commit.