Major design enhancements