Added some of Cadair's changes to the SEP.