Minor Design change :D