Daniel's changes