Add stuff from NefissaAbd-al-FattahHanafi:2005