8 Commits (Dev-Fuad)