Changed Thomas comments