Final test, tweaked updates

Final test, tweaked updates