added some @bodil fu to the code