Design Improvements #178