After Jesse updates of 12 March 2014.
Make tweaks after SH notes.