taking your changes, this is written by martine