updates from Thomas