Commit no.8 Final Commit