Changes according to Daniel's recommendagtions.