8 Commits (fix-lag)