More improvements in design