Significant design improvements