Design Issues Fix Oct 10