updated for changes in 2.1