Some design improvements ... or not