More work done on fixing EXS design.