merge Seb's changes