Updates that make it pretty stable