20131212 Morse + Main extensions