Some Design Improvements