Perhaps takes care of #2.