Changes from tommy