Thomas changes
commit