added a few enhancements