some design enhancements