Improvements on design