added two enhancements