Commit by Guillermo De los Santos Garcia for the exam