updates from Tim