Even more design improvements!