Changes from working with Tim