-Changes from Thomas