adding small enhancements