Changed: Other design modifications