Minor changes hoping to make a "context" work.