more enhancements from emily