Made changes to Thomas