little improvements on design