Cleaning up some context and trying again.