doing small enhancements