switch down to just two disciplines. #15