Some changes in "design"...