Updating for latest 6.1 changes