more design enhancements