Respond to / solve Thomas' comments