Updates to v1.001