updated for CR 0.9.169