improve design overall