Updates to 1.8.6