Updated for possible further enhancements