Daniel's second commit