added accuracy enhancements