Working in Thomas' comments