Update per suggestions by Tim and Steffen