Updated Code with new Design.