Improvements in design #2