Minor Design change