Design change and other fixs