Taking into account Thomas comments